Autogenerated HTML docs for v1.7.2.2-268-g7e423
diff --git a/config.txt b/config.txt index 05ec3fe..61831f6 100644 --- a/config.txt +++ b/config.txt
@@ -1549,6 +1549,9 @@ Whether to show a diffstat of what changed upstream since the last rebase. False by default. +rebase.autosquash:: + If set to true enable '--autosquash' option by default. + receive.autogc:: By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop @@ -1643,7 +1646,9 @@ Setting this value to \--no-tags disables automatic tag following when fetching from remote <name>. Setting it to \--tags will fetch every tag from remote <name>, even if they are not reachable from remote - branch heads. + branch heads. Passing these flags directly to linkgit:git-fetch[1] can + override this setting. See options \--tags and \--no-tags of + linkgit:git-fetch[1]. remote.<name>.vcs:: Setting this to a value <vcs> will cause git to interact with
diff --git a/fetch-options.txt b/fetch-options.txt index 9333c42..470ac31 100644 --- a/fetch-options.txt +++ b/fetch-options.txt
@@ -49,7 +49,9 @@ endif::git-pull[] By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. - This option disables this automatic tag following. + This option disables this automatic tag following. The default + behavior for a remote may be specified with the remote.<name>.tagopt + setting. See linkgit:git-config[1]. -t:: --tags:: @@ -58,7 +60,9 @@ objects reachable from the branch heads that are being tracked will not be fetched by this mechanism. This flag lets all tags and their associated objects be - downloaded. + downloaded. The default behavior for a remote may be + specified with the remote.<name>.tagopt setting. See + linkgit:git-config[1]. -u:: --update-head-ok::
diff --git a/git-config.html b/git-config.html index 5953d15..e239e27 100644 --- a/git-config.html +++ b/git-config.html
@@ -3470,6 +3470,14 @@ </p> </dd> <dt> +rebase.autosquash +</dt> +<dd> +<p> + If set to true enable <em>--autosquash</em> option by default. +</p> +</dd> +<dt> receive.autogc </dt> <dd> @@ -3657,7 +3665,9 @@ Setting this value to --no-tags disables automatic tag following when fetching from remote <name>. Setting it to --tags will fetch every tag from remote <name>, even if they are not reachable from remote - branch heads. + branch heads. Passing these flags directly to <a href="git-fetch.html">git-fetch(1)</a> can + override this setting. See options --tags and --no-tags of + <a href="git-fetch.html">git-fetch(1)</a>. </p> </dd> <dt> @@ -4044,7 +4054,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-08-23 17:09:59 UTC +Last updated 2010-09-01 18:42:44 UTC </div> </div> </body>
diff --git a/git-fast-export.html b/git-fast-export.html index c09e483..14b8441 100644 --- a/git-fast-export.html +++ b/git-fast-export.html
@@ -440,6 +440,17 @@ </p> </dd> <dt> +--full-tree +</dt> +<dd> +<p> + This option will cause fast-export to issue a "deleteall" + directive for each commit followed by a full list of all files + in the commit (as opposed to just listing the files which are + different from the commit's first parent). +</p> +</dd> +<dt> [git-rev-list-args…] </dt> <dd> @@ -494,7 +505,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-07-21 21:55:22 UTC +Last updated 2010-09-01 18:42:44 UTC </div> </div> </body>
diff --git a/git-fast-export.txt b/git-fast-export.txt index 98ec6b5..8a6a3cb 100644 --- a/git-fast-export.txt +++ b/git-fast-export.txt
@@ -90,6 +90,12 @@ resulting stream can only be used by a repository which already contains the necessary objects. +--full-tree:: + This option will cause fast-export to issue a "deleteall" + directive for each commit followed by a full list of all files + in the commit (as opposed to just listing the files which are + different from the commit's first parent). + [git-rev-list-args...]:: A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references
diff --git a/git-fetch.html b/git-fetch.html index 579da26..cc6fc72 100644 --- a/git-fetch.html +++ b/git-fetch.html
@@ -443,7 +443,9 @@ <p> By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. - This option disables this automatic tag following. + This option disables this automatic tag following. The default + behavior for a remote may be specified with the remote.<name>.tagopt + setting. See <a href="git-config.html">git-config(1)</a>. </p> </dd> <dt> @@ -459,7 +461,9 @@ objects reachable from the branch heads that are being tracked will not be fetched by this mechanism. This flag lets all tags and their associated objects be - downloaded. + downloaded. The default behavior for a remote may be + specified with the remote.<name>.tagopt setting. See + <a href="git-config.html">git-config(1)</a>. </p> </dd> <dt> @@ -897,7 +901,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-08-18 22:14:51 UTC +Last updated 2010-09-01 18:42:44 UTC </div> </div> </body>
diff --git a/git-pull.html b/git-pull.html index 5d41231..0a6ac05 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -656,7 +656,9 @@ <p> By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. - This option disables this automatic tag following. + This option disables this automatic tag following. The default + behavior for a remote may be specified with the remote.<name>.tagopt + setting. See <a href="git-config.html">git-config(1)</a>. </p> </dd> <dt> @@ -672,7 +674,9 @@ objects reachable from the branch heads that are being tracked will not be fetched by this mechanism. This flag lets all tags and their associated objects be - downloaded. + downloaded. The default behavior for a remote may be + specified with the remote.<name>.tagopt setting. See + <a href="git-config.html">git-config(1)</a>. </p> </dd> <dt> @@ -1253,7 +1257,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-08-18 22:14:52 UTC +Last updated 2010-09-01 18:42:45 UTC </div> </div> </body>
diff --git a/git-rebase.html b/git-rebase.html index e690fa1..1b73dd0 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -498,6 +498,14 @@ rebase. False by default. </p> </dd> +<dt> +rebase.autosquash +</dt> +<dd> +<p> + If set to true enable <em>--autosquash</em> option by default. +</p> +</dd> </dl></div> </div> <h2 id="_options">OPTIONS</h2> @@ -758,6 +766,9 @@ <dt> --autosquash </dt> +<dt> +--no-autosquash +</dt> <dd> <p> When the commit log message begins with "squash! …" (or @@ -768,6 +779,9 @@ commit from <tt>pick</tt> to <tt>squash</tt> (or <tt>fixup</tt>). </p> <div class="para"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div> +<div class="para"><p>If the <em>--autosquash</em> option is enabled by default using the +configuration variable <tt>rebase.autosquash</tt>, this option can be +used to override and disable this setting.</p></div> </dd> <dt> --no-ff @@ -1287,7 +1301,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-08-22 07:24:54 UTC +Last updated 2010-09-01 18:42:45 UTC </div> </div> </body>
diff --git a/git-rebase.txt b/git-rebase.txt index 3b87f1a..45c52d2 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -199,6 +199,9 @@ Whether to show a diffstat of what changed upstream since the last rebase. False by default. +rebase.autosquash:: + If set to true enable '--autosquash' option by default. + OPTIONS ------- <newbase>:: @@ -333,6 +336,7 @@ instead. --autosquash:: +--no-autosquash:: When the commit log message begins with "squash! ..." (or "fixup! ..."), and there is a commit whose title begins with the same ..., automatically modify the todo list of rebase -i @@ -341,6 +345,10 @@ commit from `pick` to `squash` (or `fixup`). + This option is only valid when the '--interactive' option is used. ++ +If the '--autosquash' option is enabled by default using the +configuration variable `rebase.autosquash`, this option can be +used to override and disable this setting. --no-ff:: With --interactive, cherry-pick all rebased commits instead of
diff --git a/howto-index.html b/howto-index.html index 3579da9..e6ea1b5 100644 --- a/howto-index.html +++ b/howto-index.html
@@ -417,7 +417,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-08-23 17:10:00 UTC +Last updated 2010-09-01 18:42:46 UTC </div> </div> </body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 190eed5..0a1eca2 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html
@@ -403,25 +403,19 @@ $ git rebase master * Applying: Redo "revert" using three-way merge machinery. First trying simple merge strategy to cherry-pick. -Finished one cherry-pick. * Applying: Remove git-apply-patch-script. First trying simple merge strategy to cherry-pick. Simple cherry-pick fails; trying Automatic cherry-pick. Removing Documentation/git-apply-patch-script.txt Removing git-apply-patch-script -Finished one cherry-pick. * Applying: Document "git cherry-pick" and "git revert" First trying simple merge strategy to cherry-pick. -Finished one cherry-pick. * Applying: mailinfo and applymbox updates First trying simple merge strategy to cherry-pick. -Finished one cherry-pick. * Applying: Show commits in topo order and name all commits. First trying simple merge strategy to cherry-pick. -Finished one cherry-pick. * Applying: More documentation updates. -First trying simple merge strategy to cherry-pick. -Finished one cherry-pick.</tt></pre> +First trying simple merge strategy to cherry-pick.</tt></pre> </div></div> <div class="para"><p>The temporary tag <em>pu-anchor</em> is me just being careful, in case <em>git rebase</em> screws up. After this, I can do these for sanity check:</p></div> @@ -482,7 +476,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-07-21 21:55:45 UTC +Last updated 2010-09-01 18:42:46 UTC </div> </div> </body>
diff --git a/howto/revert-branch-rebase.txt b/howto/revert-branch-rebase.txt index 8c32da6..093c656 100644 --- a/howto/revert-branch-rebase.txt +++ b/howto/revert-branch-rebase.txt
@@ -112,25 +112,19 @@ $ git rebase master * Applying: Redo "revert" using three-way merge machinery. First trying simple merge strategy to cherry-pick. -Finished one cherry-pick. * Applying: Remove git-apply-patch-script. First trying simple merge strategy to cherry-pick. Simple cherry-pick fails; trying Automatic cherry-pick. Removing Documentation/git-apply-patch-script.txt Removing git-apply-patch-script -Finished one cherry-pick. * Applying: Document "git cherry-pick" and "git revert" First trying simple merge strategy to cherry-pick. -Finished one cherry-pick. * Applying: mailinfo and applymbox updates First trying simple merge strategy to cherry-pick. -Finished one cherry-pick. * Applying: Show commits in topo order and name all commits. First trying simple merge strategy to cherry-pick. -Finished one cherry-pick. * Applying: More documentation updates. First trying simple merge strategy to cherry-pick. -Finished one cherry-pick. ------------------------------------------------ The temporary tag 'pu-anchor' is me just being careful, in case 'git
